delete qt4 support in configure.

diff --git a/.travis.yml b/.travis.yml
index e7af5d8c4d0ef18a61bc4f310827c9bc3a199043..74935accf7ef40c5dd774861ce65cd555573f64f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,6 @@ language: cpp
 compiler:
   - gcc
   - clang
-before_install:
-#   as a bit of a kludge remove qt4 so our configure finds qt5.
-  - sudo apt-get -y --purge remove qt4-qmake qt4-linguist-tools
 addons:
   apt:
     packages:

diff --git a/configure b/configure
index 730315af9d6bb1e7ad401abcb6326349dfcbc957..ad4d502b7f4694326ceeca404d24bf3e847b1a3b 100755 (executable)
--- a/configure
+++ b/configure
@@ -4756,8 +4756,11 @@ esac
 # On RHEL/OEL/SL/CENTOS/FEDORA qmake is from Qt3, and qmake-qt4 is from Qt4.
 # If qmake-qt4 isn't found look for the standard name qmake and assume it is
 # from a useful version Qt.
+# On Ubuntu qmake-qt4 exists, but qmake-qt5 does not.
+# If we select qmake-qt4 this will defeat qtchooser.
+# we no longer support qt4.
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in qmake-qt5 qmake-qt4 qmake
+  for ac_prog in qmake-qt5 qmake
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4801,7 +4804,7 @@ fi
 fi
 if test -z "$QMAKE"; then
   ac_ct_QMAKE=$QMAKE
-  for ac_prog in qmake-qt5 qmake-qt4 qmake
+  for ac_prog in qmake-qt5 qmake
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4857,7 +4860,7 @@ esac
 fi
 
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in lupdate-qt5 lupdate-qt4 lupdate
+  for ac_prog in lupdate-qt5 lupdate
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4901,7 +4904,7 @@ fi
 fi
 if test -z "$LUPDATE"; then
   ac_ct_LUPDATE=$LUPDATE
-  for ac_prog in lupdate-qt5 lupdate-qt4 lupdate
+  for ac_prog in lupdate-qt5 lupdate
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4957,7 +4960,7 @@ esac
 fi
 
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in lrelease-qt5 lrelease-qt4 lrelease
+  for ac_prog in lrelease-qt5 lrelease
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5001,7 +5004,7 @@ fi
 fi
 if test -z "$LRELEASE"; then
   ac_ct_LRELEASE=$LRELEASE
-  for ac_prog in lrelease-qt5 lrelease-qt4 lrelease
+  for ac_prog in lrelease-qt5 lrelease
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -5058,7 +5061,7 @@ fi
 
 
 if test "$QMAKE" = no ; then
-  as_fn_error $? "Qt4 or Qt5 is required, but neither was found" "$LINENO" 5;
+  as_fn_error $? "Qt5 is required, but neither was found" "$LINENO" 5;
 fi
 
 # guess the name of the Qt Core library.

diff --git a/configure.in b/configure.in
index fad9cc923cee3a031d0fdaedf61981cbc3fc13f8..88a3eed85dac256f07d73029db51f89dbef18e16 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -159,12 +159,15 @@ AC_SUBST(RC)
 # On RHEL/OEL/SL/CENTOS/FEDORA qmake is from Qt3, and qmake-qt4 is from Qt4.
 # If qmake-qt4 isn't found look for the standard name qmake and assume it is
 # from a useful version Qt.
-AC_CHECK_TOOLS(QMAKE, [qmake-qt5 qmake-qt4 qmake], "no")
-AC_CHECK_TOOLS(LUPDATE, [lupdate-qt5 lupdate-qt4 lupdate])
-AC_CHECK_TOOLS(LRELEASE, [lrelease-qt5 lrelease-qt4 lrelease])
+# On Ubuntu qmake-qt4 exists, but qmake-qt5 does not.
+# If we select qmake-qt4 this will defeat qtchooser.
+# we no longer support qt4.
+AC_CHECK_TOOLS(QMAKE, [qmake-qt5 qmake], "no")
+AC_CHECK_TOOLS(LUPDATE, [lupdate-qt5 lupdate])
+AC_CHECK_TOOLS(LRELEASE, [lrelease-qt5 lrelease])
 
 if test "$QMAKE" = no ; then
-  AC_MSG_ERROR([Qt4 or Qt5 is required, but neither was found]);
+  AC_MSG_ERROR([Qt5 is required, but neither was found]);
 fi
 
 # guess the name of the Qt Core library.